notebook: Respect padding when computing tabs for left/right

This mirrors the top/bottom code

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 61e30795e1fe1ae470d3b4bda48fad567740a422..2d4530c5c2030c37990e975bc632a96605ada474 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -6177,11 +6177,16 @@ gtk_notebook_page_allocate (GtkNotebook     *notebook,
            */
           if (page != priv->cur_page && tab_overlap > tab_curvature)
             {
-              child_allocation.height -= tab_overlap - tab_curvature;
-
               if (gtk_notebook_page_num (notebook, page->child) >
                   gtk_notebook_page_num (notebook, priv->cur_page->child))
-                child_allocation.y += tab_overlap - tab_curvature;
+                {
+                  child_allocation.y += tab_overlap - tab_curvature - tab_padding.top;
+                  child_allocation.height -= tab_overlap - tab_curvature - tab_padding.top;
+                }
+              else
+                {
+                  child_allocation.height -= tab_overlap - tab_curvature - tab_padding.bottom;
+                }
             }
         }
       else